@@ -198,23 +198,23 @@ ${payment.statusDesc?default(payment.statusId)} - ${(payment.comments)?if_exists} + ${(payment.comments)!} - ${(payment.partyFromFirstName)?if_exists} ${(payment.partyFromLastName)?if_exists} ${(payment.partyFromGroupName)?if_exists}[${(payment.partyIdFrom)?if_exists}] + ${(payment.partyFromFirstName)!} ${(payment.partyFromLastName)!} ${(payment.partyFromGroupName)!}[${(payment.partyIdFrom)!}] - ${(payment.partyToFirstName)?if_exists} ${(payment.partyToLastName)?if_exists} ${(payment.partyToGroupName)?if_exists}[${(payment.partyIdTo)?if_exists}] + ${(payment.partyToFirstName)!} ${(payment.partyToLastName)!} ${(payment.partyToGroupName)!}[${(payment.partyIdTo)!}] - ${payment.effectiveDate?if_exists} + ${payment.effectiveDate!} <@ofbizCurrency amount = payment.amount isoCode = payment.currencyUomId /> <#assign amountToApply = Static["org.ofbiz.accounting.payment.PaymentWorker"].getPaymentNotApplied(payment) /> <@ofbizCurrency amount = amountToApply isoCode = amountToApply.currencyUomId /> - <#assign creditCard = (delegator.findOne("CreditCard", {"paymentMethodId" : payment.paymentMethodId}, false))?if_exists /> + <#assign creditCard = (delegator.findOne("CreditCard", {"paymentMethodId" : payment.paymentMethodId}, false))! /> ${payment.paymentMethodTypeDesc?default(payment.paymentMethodTypeId)} - <#if creditCard?has_content>/${(creditCard.cardType)?if_exists} + <#if creditCard?has_content>/${(creditCard.cardType)!} Index: applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl =================================================================== --- applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl (working copy) @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> -<#if agreement?exists> +<#if agreement??>

${uiLabelMap.AccountingCompanyNameCard}

${uiLabelMap.AccountingFirstNameCard}

${uiLabelMap.AccountingMiddleNameCard}

${uiLabelMap.AccountingLastNameCard}

${uiLabelMap.CommonDescription}

${uiLabelMap.AccountingInvoiceDateAbbr}: - ${invoiceDate?if_exists} + ${invoiceDate!}

Index: applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl =================================================================== --- applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl (working copy) @@ -41,7 +41,7 @@ <#if PayrolList?has_content> <#list PayrolList as payrolList> - <#if payrolList.parentTypeId?if_exists == payrolGroup.invoiceItemTypeId?if_exists> + <#if payrolList.parentTypeId! == payrolGroup.invoiceItemTypeId!> ${payrolList.description} : Index: applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl =================================================================== --- applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl (working copy) @@ -26,14 +26,14 @@ <#if billingAddress?has_content> <#assign billingPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billingParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/> ${billingPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")} - <#if billingAddress.attnName?exists> + <#if billingAddress.attnName??> ${billingAddress.attnName} - ${billingAddress.address1?if_exists} - <#if billingAddress.address2?exists> + ${billingAddress.address1!} + <#if billingAddress.address2??> ${billingAddress.address2} - ${billingAddress.city?if_exists} ${billingAddress.stateProvinceGeoId?if_exists} ${billingAddress.postalCode?if_exists} + ${billingAddress.city!} ${billingAddress.stateProvinceGeoId!} ${billingAddress.postalCode!} <#else> ${uiLabelMap.AccountingNoGenBilAddressFound}${billingParty.partyId} Index: applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl =================================================================== --- applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl (working copy) @@ -54,7 +54,7 @@ <#assign termType = term.getRelatedOne("TermType", false)/>

- ${termType.description?if_exists} ${term.description?if_exists} ${term.termDays?if_exists} ${term.textValue?if_exists} + ${termType.description!} ${term.description!} ${term.termDays!} ${term.textValue!}

@@ -98,12 +98,12 @@ <#assign itemType = invoiceItem.getRelatedOne("InvoiceItemType", false)> <#assign isItemAdjustment = Static["org.ofbiz.entity.util.EntityTypeUtil"].hasParentType(delegator, "InvoiceItemType", "invoiceItemTypeId", itemType.getString("invoiceItemTypeId"), "parentTypeId", "INVOICE_ADJ")/> - <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false)?if_exists> - <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling", null, null, false)?if_exists> + <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false)!> + <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling", null, null, false)!> <#if itemBillings?has_content> <#assign itemBilling = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(itemBillings)> <#if itemBilling?has_content> - <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance", false)?if_exists> + <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance", false)!> <#if itemIssuance?has_content> <#assign newShipmentId = itemIssuance.shipmentId> <#assign issuedDateTime = itemIssuance.issuedDateTime/> @@ -118,7 +118,7 @@ <#assign description=itemType.get("description",locale)> - <#if newShipmentId?exists & newShipmentId != currentShipmentId> + <#if newShipmentId?? & newShipmentId != currentShipmentId> <#-- the shipment id is printed at the beginning for each group of invoice items created for the same shipment --> @@ -129,7 +129,7 @@

- ${uiLabelMap.ProductShipmentId}: ${newShipmentId}<#if issuedDateTime?exists> ${uiLabelMap.CommonDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(issuedDateTime)} + ${uiLabelMap.ProductShipmentId}: ${newShipmentId}<#if issuedDateTime??> ${uiLabelMap.CommonDate}: ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(issuedDateTime)}

- ${invoiceItem.productId?if_exists} + ${invoiceItem.productId!}

- ${description?if_exists} + ${description!}

- <#if invoiceItem.quantity?exists>${invoiceItem.quantity?string.number} + <#if invoiceItem.quantity??>${invoiceItem.quantity?string.number}

- <#if invoiceItem.quantity?exists><@ofbizCurrency amount=invoiceItem.amount?if_exists isoCode=invoice.currencyUomId?if_exists/> + <#if invoiceItem.quantity??><@ofbizCurrency amount=invoiceItem.amount! isoCode=invoice.currencyUomId!/>

- <@ofbizCurrency amount=(Static["org.ofbiz.accounting.invoice.InvoiceWorker"].getInvoiceItemTotal(invoiceItem)) isoCode=invoice.currencyUomId?if_exists/> + <@ofbizCurrency amount=(Static["org.ofbiz.accounting.invoice.InvoiceWorker"].getInvoiceItemTotal(invoiceItem)) isoCode=invoice.currencyUomId!/>

@@ -162,10 +162,10 @@

- ${description?if_exists} + ${description!}

@@ -185,7 +185,7 @@ ${uiLabelMap.AccountingTotalCapital}

- <@ofbizCurrency amount=invoiceTotal isoCode=invoice.currencyUomId?if_exists/> + <@ofbizCurrency amount=invoiceTotal isoCode=invoice.currencyUomId!/>

@@ -202,7 +202,7 @@ - <@ofbizCurrency amount=invoiceNoTaxTotal isoCode=invoice.currencyUomId?if_exists/> + <@ofbizCurrency amount=invoiceNoTaxTotal isoCode=invoice.currencyUomId!/>

${taxRate.description}

- <@ofbizCurrency amount=vatTaxesByType[vatTaxId] isoCode=invoice.currencyUomId?if_exists/> + <@ofbizCurrency amount=vatTaxesByType[vatTaxId] isoCode=invoice.currencyUomId!/>

- ${invoice.getRelatedOne("InvoiceType", false).get("description",locale)?if_exists} + ${invoice.getRelatedOne("InvoiceType", false).get("description",locale)!}

${uiLabelMap.AccountingInvoiceDateAbbr}: - ${invoiceDetail.invoiceDate?if_exists} + ${invoiceDetail.invoiceDate!}

${uiLabelMap.AccountingCustNr}:

- <#if partyName?has_content>${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists} + <#if partyName?has_content>${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!}

@@ -107,19 +107,19 @@ <#assign billingAddress = invoiceDetail.billingAddress /> <#assign billingPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billingParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/> ${billingPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")} - <#if billingAddress.attnName?exists> + <#if billingAddress.attnName??> ${billingAddress.attnName} - ${billingAddress.address1?if_exists} - <#if billingAddress.address2?exists> + ${billingAddress.address1!} + <#if billingAddress.address2??> ${billingAddress.address2} - <#assign stateGeo = (delegator.findOne("Geo", {"geoId", billingAddress.stateProvinceGeoId?if_exists}, false))?if_exists /> - ${billingAddress.city?if_exists} <#if stateGeo?has_content>${stateGeo.geoName?if_exists} ${billingAddress.postalCode?if_exists} + <#assign stateGeo = (delegator.findOne("Geo", {"geoId", billingAddress.stateProvinceGeoId!}, false))! /> + ${billingAddress.city!} <#if stateGeo?has_content>${stateGeo.geoName!} ${billingAddress.postalCode!} <#else> - ${uiLabelMap.AccountingNoGenBilAddressFound} <#if partyName?has_content>${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists} + ${uiLabelMap.AccountingNoGenBilAddressFound} <#if partyName?has_content>${partyName.firstName!} ${partyName.lastName!} ${partyName.groupName!} @@ -130,7 +130,7 @@ <#if invoiceDetail.orders?has_content> - <#assign orders = invoiceDetail.orders?if_exists /> + <#assign orders = invoiceDetail.orders! />

@@ -148,7 +148,7 @@ <#if invoiceDetail.invoiceItems?has_content> - <#assign invoiceItems = invoiceDetail.invoiceItems?if_exists /> + <#assign invoiceItems = invoiceDetail.invoiceItems! />

@@ -185,12 +185,12 @@ <#-- if the item has a description, then use its description. Otherwise, use the description of the invoiceItemType --> <#list invoiceItems as invoiceItem> <#assign itemType = invoiceItem.getRelatedOne("InvoiceItemType", false)> - <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false)?if_exists> - <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling", null, null, false)?if_exists> + <#assign taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false)!> + <#assign itemBillings = invoiceItem.getRelated("OrderItemBilling", null, null, false)!> <#if itemBillings?has_content> <#assign itemBilling = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(itemBillings)> <#if itemBilling?has_content> - <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance", false)?if_exists> + <#assign itemIssuance = itemBilling.getRelatedOne("ItemIssuance", false)!> <#if itemIssuance?has_content> <#assign newShipmentId = itemIssuance.shipmentId> @@ -204,7 +204,7 @@ <#assign description=itemType.get("description",locale)> - <#if newShipmentId?exists & newShipmentId != currentShipmentId> + <#if newShipmentId?? & newShipmentId != currentShipmentId> <#-- the shipment id is printed at the beginning for each group of invoice items created for the same shipment --> @@ -230,19 +230,19 @@ ${invoiceItem.invoiceItemSeqId}

- ${invoiceItem.productId?if_exists} + ${invoiceItem.productId!}

- ${description?if_exists} + ${description!}

- <#if invoiceItem.quantity?exists>${invoiceItem.quantity?string.number} + <#if invoiceItem.quantity??>${invoiceItem.quantity?string.number}

@@ -258,8 +258,8 @@ <#if invoiceDetail.invoiceTotal?has_content> - <#assign invoiceTotal = invoiceDetail.invoiceTotal?if_exists /> - <@ofbizCurrency amount=invoiceTotal isoCode=invoice.currencyUomId?if_exists/> + <#assign invoiceTotal = invoiceDetail.invoiceTotal! /> + <@ofbizCurrency amount=invoiceTotal isoCode=invoice.currencyUomId!/> @@ -279,8 +279,8 @@ <#if invoiceDetail.invoiceNoTaxTotal?has_content> - <#assign invoiceNoTaxTotal = invoiceDetail.invoiceNoTaxTotal?if_exists /> - <@ofbizCurrency amount=invoiceNoTaxTotal isoCode=invoice.currencyUomId?if_exists/> + <#assign invoiceNoTaxTotal = invoiceDetail.invoiceNoTaxTotal! /> + <@ofbizCurrency amount=invoiceNoTaxTotal isoCode=invoice.currencyUomId!/> Index: applications/accounting/webapp/accounting/payment/manualCCTx.ftl =================================================================== --- applications/accounting/webapp/accounting/payment/manualCCTx.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/payment/manualCCTx.ftl (working copy) @@ -75,7 +75,7 @@ ${uiLabelMap.PartyFirstName} - + @@ -83,7 +83,7 @@ ${uiLabelMap.PartyLastName} - + @@ -104,7 +104,7 @@ ${uiLabelMap.PartyFirstName} - disabled /> + disabled /> @@ -112,7 +112,7 @@ ${uiLabelMap.PartyLastName} - disabled /> + disabled /> @@ -121,7 +121,7 @@ ${uiLabelMap.AccountingBillToAddress1} - disabled /> + disabled /> @@ -129,14 +129,14 @@ ${uiLabelMap.AccountingBillToAddress2} - disabled /> + disabled /> ${uiLabelMap.CommonCity} - disabled /> + disabled /> @@ -144,8 +144,8 @@ ${uiLabelMap.CommonStateProvince} - disabled> + <#if (postalFields.stateProvinceGeoId)??> <#else> @@ -159,7 +159,7 @@ ${uiLabelMap.CommonZipPostalCode} - disabled /> + disabled /> @@ -167,8 +167,8 @@ ${uiLabelMap.CommonCountry} - disabled> + <#if (postalFields.countryGeoId)??> Index: applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl =================================================================== --- applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (working copy) @@ -149,18 +149,18 @@ <#list paymentApplications as paymentApplication> - <#assign invoice = paymentApplication.getRelatedOne("Invoice", false)?if_exists> + <#assign invoice = paymentApplication.getRelatedOne("Invoice", false)!>

${payment.effectiveDate?date?string.short}

- <#if invoice?exists>${uiLabelMap.AccountingInvoice} : ${invoice.invoiceId} + <#if invoice??>${uiLabelMap.AccountingInvoice} : ${invoice.invoiceId}

- <#if invoice?exists>${invoice.referenceNumber?if_exists} - ${paymentApplication.taxAuthGeoId?if_exists} + <#if invoice??>${invoice.referenceNumber!} + ${paymentApplication.taxAuthGeoId!}

@@ -170,9 +170,9 @@ ${paymentApplication.getBigDecimal("amountApplied").setScale(decimals, rounding).toString()} - <#if invoice.invoiceTypeId?if_exists == "PAYROL_INVOICE"> - <#assign InvoiceItems = invoice.getRelated("InvoiceItem", null, null, false)?if_exists> - <#assign PayrolGroups = PayrolGroup?if_exists> + <#if invoice.invoiceTypeId! == "PAYROL_INVOICE"> + <#assign InvoiceItems = invoice.getRelated("InvoiceItem", null, null, false)!> + <#assign PayrolGroups = PayrolGroup!> <#list PayrolGroups as payrolGroup> <#assign fontSize = "75%"> <#assign lineStyle = "dashed"> @@ -181,13 +181,13 @@ <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign quantity = 0> <#assign amount = 0> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0> <#if amount != 0 && quantity == 0 ><#assign quantity = 1> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -199,7 +199,7 @@

- ${payrolGroup.description?if_exists} + ${payrolGroup.description!}

Quantity @@ -217,11 +217,11 @@ <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0> <#if amount != 0 && quantity == 0 ><#assign quantity = 1> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -229,10 +229,10 @@ <#assign sumSubTotal = sumSubTotal + subTotal> - ${invoiceItemType.description?if_exists} - ${quantity?if_exists} - ${amount?if_exists} - ${subTotal?if_exists} + ${invoiceItemType.description!} + ${quantity!} + ${amount!} + ${subTotal!} @@ -241,11 +241,11 @@ <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0> <#if amount != 0 && quantity == 0><#assign quantity = 1> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -257,9 +257,9 @@

- ${sumQuantity?if_exists} - ${sumAmount?if_exists} - ${sumSubTotal?if_exists} + ${sumQuantity!} + ${sumAmount!} + ${sumSubTotal!}

@@ -345,18 +345,18 @@ <#list paymentApplications as paymentApplication> - <#assign invoice = paymentApplication.getRelatedOne("Invoice", false)?if_exists> + <#assign invoice = paymentApplication.getRelatedOne("Invoice", false)!>

${payment.effectiveDate?date?string.short}

- <#if invoice?exists>${uiLabelMap.AccountingInvoice} : ${invoice.invoiceId} + <#if invoice??>${uiLabelMap.AccountingInvoice} : ${invoice.invoiceId}

- <#if invoice?exists>${invoice.referenceNumber?if_exists} - ${paymentApplication.taxAuthGeoId?if_exists} + <#if invoice??>${invoice.referenceNumber!} + ${paymentApplication.taxAuthGeoId!}

@@ -366,9 +366,9 @@ ${paymentApplication.getBigDecimal("amountApplied").setScale(decimals, rounding).toString()}

- <#if invoice.invoiceTypeId?if_exists == "PAYROL_INVOICE"> - <#assign InvoiceItems = invoice.getRelated("InvoiceItem", null, null, false)?if_exists> - <#assign PayrolGroups = PayrolGroup?if_exists> + <#if invoice.invoiceTypeId! == "PAYROL_INVOICE"> + <#assign InvoiceItems = invoice.getRelated("InvoiceItem", null, null, false)!> + <#assign PayrolGroups = PayrolGroup!> <#list PayrolGroups as payrolGroup> <#assign fontSize = "75%"> <#assign lineStyle = "dashed"> @@ -377,13 +377,13 @@ <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign quantity = 0> <#assign amount = 0> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0> <#if amount != 0 && quantity == 0 ><#assign quantity = 1> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -395,7 +395,7 @@

- ${payrolGroup.description?if_exists} + ${payrolGroup.description!}

Quantity @@ -413,11 +413,11 @@ <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0> <#if amount != 0 && quantity == 0 ><#assign quantity = 1> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -425,10 +425,10 @@ <#assign sumSubTotal = sumSubTotal + subTotal> - ${invoiceItemType.description?if_exists} - ${quantity?if_exists} - ${amount?if_exists} - ${subTotal?if_exists} + ${invoiceItemType.description!} + ${quantity!} + ${amount!} + ${subTotal!} @@ -437,11 +437,11 @@ <#assign sumAmount = 0> <#assign sumSubTotal = 0> <#list InvoiceItems as invoiceItem> - <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)?if_exists> + <#assign invoiceItemType = invoiceItem.getRelatedOne("InvoiceItemType", false)!> <#assign subTotal = 0> <#if invoiceItemType.parentTypeId == payrolGroup.invoiceItemTypeId> - <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity?if_exists><#else><#assign quantity = 0> - <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount?if_exists><#else><#assign amount = 0> + <#if invoiceItem.quantity?has_content><#assign quantity = invoiceItem.quantity!><#else><#assign quantity = 0> + <#if invoiceItem.amount?has_content><#assign amount = invoiceItem.amount!><#else><#assign amount = 0> <#if amount != 0 && quantity == 0><#assign quantity = 1> <#assign subTotal = quantity * amount> <#assign sumQuantity = sumQuantity + quantity> @@ -453,9 +453,9 @@

- ${sumQuantity?if_exists} - ${sumAmount?if_exists} - ${sumSubTotal?if_exists} + ${sumQuantity!} + ${sumAmount!} + ${sumSubTotal!}

Index: applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl =================================================================== --- applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (working copy) @@ -73,13 +73,13 @@

<#if paymentList?has_content> - - - - - - - + + + + + + +

${uiLabelMap.AccountingRunningTotal} : @@ -99,11 +99,11 @@ <#list paymentList as payment> class="alternate-row"> ${payment.paymentId} - ${payment.paymentTypeDesc?if_exists} + ${payment.paymentTypeDesc!} ${(payment.partyFromFirstName)!} ${(payment.partyFromLastName)!} ${(payment.partyFromGroupName)!} ${(payment.partyToFirstName)!} ${(payment.partyToLastName)!} ${(payment.partyToGroupName)!} <@ofbizCurrency amount=payment.amount isoCode=payment.currencyUomId/> - ${payment.effectiveDate?if_exists} + ${payment.effectiveDate!} ${uiLabelMap.AccountingDeposit} <#assign alt_row = !alt_row> Index: applications/accounting/webapp/accounting/payment/manualTx.ftl =================================================================== --- applications/accounting/webapp/accounting/payment/manualTx.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/payment/manualTx.ftl (working copy) @@ -23,7 +23,7 @@ <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session) || security.hasEntityPermission("ACCOUNTING", "_CREATE", session)> ${setRequestAttribute("validTx", "false")} - <#if requestParameters.paymentMethodId?exists> + <#if requestParameters.paymentMethodId??> @@ -47,12 +47,12 @@ <#if currentStore?has_content> -

<#if currentStore.storeName?exists>${currentStore.storeName}<#else>${currentStore.productStoreId}

<#if currentStore.storeName??>${currentStore.storeName}<#else>${currentStore.productStoreId}

<#else> Index: applications/accounting/webapp/accounting/reports/CostCentersReport.ftl =================================================================== --- applications/accounting/webapp/accounting/reports/CostCentersReport.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/reports/CostCentersReport.ftl (working copy) @@ -31,12 +31,12 @@ <#assign alt_row = false> <#list glAcctBalancesByCostCenter as glAcctBalanceByCostCenter> class="alternate-row"> - ${glAcctBalanceByCostCenter.glAccountId?if_exists} - ${glAcctBalanceByCostCenter.accountCode?if_exists} - ${glAcctBalanceByCostCenter.accountName?if_exists} - ${glAcctBalanceByCostCenter.balance?if_exists} + ${glAcctBalanceByCostCenter.glAccountId!} + ${glAcctBalanceByCostCenter.accountCode!} + ${glAcctBalanceByCostCenter.accountName!} + ${glAcctBalanceByCostCenter.balance!} <#list glAccountCategories as glAccountCategory> - ${(glAcctBalanceByCostCenter[glAccountCategory.glAccountCategoryId?if_exists]?if_exists)} + ${(glAcctBalanceByCostCenter[glAccountCategory.glAccountCategoryId!]!)} <#assign alt_row = !alt_row> Index: applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl =================================================================== --- applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl (working copy) @@ -173,7 +173,7 @@ ${(acctgTransEntry.debitCreditFlag)!}

- <#if acctgTransEntry.amount?exists><@ofbizCurrency amount=(acctgTransEntry.amount)! isoCode=(acctgTransEntry.currencyUomId)!/> + <#if acctgTransEntry.amount??><@ofbizCurrency amount=(acctgTransEntry.amount)! isoCode=(acctgTransEntry.currencyUomId)!/>

Index: applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl =================================================================== --- applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl (working copy) @@ -30,11 +30,11 @@ ${uiLabelMap.FormFieldTitle_accountName}

- ${uiLabelMap.FormFieldTitle_postedBalance} - (${currencyUomId?if_exists}) + ${uiLabelMap.FormFieldTitle_postedBalance} - (${currencyUomId!}) <#list glAccountCategories as glAccountCategory> - ${glAccountCategory.description?if_exists} - (${currencyUomId?if_exists}) + ${glAccountCategory.description!} - (${currencyUomId!}) @@ -43,20 +43,20 @@ <#if glAcctgOrgAndCostCenter?has_content>

- ${glAcctBalanceByCostCenter.glAccountId?if_exists} + ${glAcctBalanceByCostCenter.glAccountId!}

- ${glAcctBalanceByCostCenter.accountCode?if_exists} + ${glAcctBalanceByCostCenter.accountCode!}

- ${glAcctBalanceByCostCenter.accountName?if_exists} + ${glAcctBalanceByCostCenter.accountName!}

- ${glAcctBalanceByCostCenter.balance?if_exists!} + ${glAcctBalanceByCostCenter.balance!!} <#list glAccountCategories as glAccountCategory> - ${(glAcctBalanceByCostCenter[glAccountCategory.glAccountCategoryId?if_exists]?if_exists)} + ${(glAcctBalanceByCostCenter[glAccountCategory.glAccountCategoryId!]!)} Index: applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl =================================================================== --- applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl (working copy) @@ -19,7 +19,7 @@ <#macro resultSummary resultMap> <#if resultMap?has_content> - ${resultMap.quantityTotal?default(0)}:${resultMap.amountTotal?default(0)}:<#if (resultMap.quantityTotal?exists && resultMap.quantityTotal > 0)>${resultMap.amountTotal/resultMap.quantityTotal}<#else/>0 + ${resultMap.quantityTotal?default(0)}:${resultMap.amountTotal?default(0)}:<#if (resultMap.quantityTotal?? && resultMap.quantityTotal > 0)>${resultMap.amountTotal/resultMap.quantityTotal}<#else/>0 <#else/> 0:0:0 @@ -27,9 +27,9 @@

Month: ${month}/${year}
Root Category: ${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(rootProductCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists} [${rootProductCategoryId}]
Organization: ${(organizationPartyName.groupName)?if_exists} [${organizationPartyId?default("No Organization Specified")}]
Currency: ${(currencyUom.description)?if_exists} [${currencyUomId?default("No Currency Specified")}]
Root Category: ${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(rootProductCategory, "CATEGORY_NAME", locale, dispatcher))!} [${rootProductCategoryId}]
Organization: ${(organizationPartyName.groupName)!} [${organizationPartyId?default("No Organization Specified")}]
Currency: ${(currencyUom.description)!} [${currencyUomId?default("No Currency Specified")}]

NOTE: each set of numbers is: <quantity>:<total amount>:<average amount>

@@ -38,10 +38,10 @@ <#list productList as product> - + <#list productCategoryList as productCategory> - + <#-- Days of the month --> @@ -54,11 +54,11 @@ <#list productList as product> - <#assign productResult = productResultMap[product.productId]?if_exists/> + <#assign productResult = productResultMap[product.productId]!/> <#list productCategoryList as productCategory> - <#assign categoryResult = categoryResultMap[productCategory.productCategoryId]?if_exists/> + <#assign categoryResult = categoryResultMap[productCategory.productCategoryId]!/> @@ -69,11 +69,11 @@ <#list productList as product> - <#assign productResult = monthProductResultMap[product.productId]?if_exists/> + <#assign productResult = monthProductResultMap[product.productId]!/> <#list productCategoryList as productCategory> - <#assign categoryResult = monthCategoryResultMap[productCategory.productCategoryId]?if_exists/> + <#assign categoryResult = monthCategoryResultMap[productCategory.productCategoryId]!/> Index: applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl =================================================================== --- applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl (working copy) @@ -21,14 +21,14 @@ ${uiLabelMap.AccountingDepositSlip} <#if paymentGroup?has_content> - ${uiLabelMap.AccountingPaymentGroupId} : ${parameters.paymentGroupId?if_exists} + ${uiLabelMap.AccountingPaymentGroupId} : ${parameters.paymentGroupId!} <#else> - ${uiLabelMap.FormFieldTitle_finAccountTransId} : ${parameters.finAccountTransId?if_exists} + ${uiLabelMap.FormFieldTitle_finAccountTransId} : ${parameters.finAccountTransId!} <#if paymentGroup?has_content> - ${uiLabelMap.AccountingPaymentGroupName} : ${paymentGroup.paymentGroupName?if_exists} + ${uiLabelMap.AccountingPaymentGroupName} : ${paymentGroup.paymentGroupName!} @@ -70,21 +70,21 @@ <#if payment.paymentMethodTypeId?has_content> <#assign paymentMethodType = delegator.findOne("PaymentMethodType", {"paymentMethodTypeId" : payment.paymentMethodTypeId}, false)/> - <#if payment.paymentMethodTypeId?if_exists == "CREDIT_CARD"> + <#if payment.paymentMethodTypeId! == "CREDIT_CARD"> <#assign creditCard = delegator.findOne("CreditCard", {"paymentMethodId" : payment.paymentMethodId}, false)/>

- ${payment.paymentId?if_exists} + ${payment.paymentId!}

- ${payment.paymentRefNum?if_exists} + ${payment.paymentRefNum!}

- ${paymentMethodType.description?if_exists} <#if creditCard?has_content && creditCard??>(${creditCard.cardType?if_exists}) + ${paymentMethodType.description!} <#if creditCard?has_content && creditCard??>(${creditCard.cardType!}) <#assign creditCard = null/>

@@ -100,9 +100,9 @@

- <@ofbizCurrency amount=payment.amount?if_exists isoCode=payment.currencyUomId?if_exists/> - <#assign totalAmount = totalAmount + payment.amount?if_exists/> - <#assign currencyUomId = payment.currencyUomId?if_exists/> + <@ofbizCurrency amount=payment.amount! isoCode=payment.currencyUomId!/> + <#assign totalAmount = totalAmount + payment.amount!/> + <#assign currencyUomId = payment.currencyUomId!/>

@@ -116,7 +116,7 @@ - <@ofbizCurrency amount=totalAmount?if_exists isoCode=currencyUomId?if_exists/> + <@ofbizCurrency amount=totalAmount! isoCode=currencyUomId!/> Index: applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl =================================================================== --- applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (working copy) @@ -38,30 +38,30 @@

Day	[No Product]	${product.internalName?default((Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher))?if_exists)} P:[${product.productId}]	${product.internalName?default((Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher))!)} P:[${product.productId}]	${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(productCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists} C:[${productCategory.productCategoryId}]	${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(productCategory, "CATEGORY_NAME", locale, dispatcher))!} C:[${productCategory.productCategoryId}]
${(productNullResult_index + 1)}	<@resultSummary resultMap=productNullResult/>	<@resultSummary resultMap=productResult/>	<@resultSummary resultMap=categoryResult/>
Month Total	<@resultSummary resultMap=monthProductNullResult/>	<@resultSummary resultMap=productResult/>	<@resultSummary resultMap=categoryResult/>

- + - <#if currentGlReconciliation.statusId?exists> + <#if currentGlReconciliation.statusId??> <#assign currentStatus = currentGlReconciliation.getRelatedOne("StatusItem", true)> - + - + - <#if currentGlReconciliation.reconciledBalance?exists> + <#if currentGlReconciliation.reconciledBalance??> - <#if currentClosingBalance?exists> + <#if currentClosingBalance??> @@ -83,30 +83,30 @@

${uiLabelMap.FormFieldTitle_glReconciliationName}	${currentGlReconciliation.glReconciliationName?if_exists}	${currentGlReconciliation.glReconciliationName!}
${uiLabelMap.CommonStatus}	${currentStatus.description?if_exists}	${currentStatus.description!}
${uiLabelMap.FormFieldTitle_reconciledDate}	${currentGlReconciliation.reconciledDate?if_exists}	${currentGlReconciliation.reconciledDate!}
${uiLabelMap.AccountingOpeningBalance}	<@ofbizCurrency amount=currentGlReconciliation.openingBalance?default('0')/>
${uiLabelMap.FormFieldTitle_reconciledBalance}	<@ofbizCurrency amount=currentGlReconciliation.reconciledBalance?default('0')/>
${uiLabelMap.FormFieldTitle_closingBalance}	<@ofbizCurrency amount=currentClosingBalance/>

- + - <#if previousGlReconciliation.statusId?exists> + <#if previousGlReconciliation.statusId??> <#assign previousStatus = previousGlReconciliation.getRelatedOne("StatusItem", true)> - + - + - <#if previousGlReconciliation.reconciledBalance?exists> + <#if previousGlReconciliation.reconciledBalance??> - <#if previousClosingBalance?exists> + <#if previousClosingBalance??> @@ -172,21 +172,21 @@ - ${finAccountTrans.finAccountTransId?if_exists} - + ${finAccountTrans.finAccountTransId!} + - - + + - - - - + + + + <#if finAccountTrans.statusId == "FINACT_TRNS_CREATED"> <#else> Index: applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl =================================================================== --- applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl (working copy) @@ -48,66 +48,66 @@ <#list acctgTransAndEntries as acctgTransEntry> - - - + + + - - - - - - - - - - + + + + + + + + + + - - + + - + Index: applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl =================================================================== --- applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (revision 1590602) +++ applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (working copy) @@ -80,35 +80,35 @@

- <#if finAccountTransList?has_content && parameters.noConditionFind?exists && parameters.noConditionFind == 'Y'> - <#if !grandTotal?exists> + <#if finAccountTransList?has_content && parameters.noConditionFind?? && parameters.noConditionFind == 'Y'> + <#if !grandTotal??>

${uiLabelMap.AccountingRunningTotal} :

- + - - <#if !grandTotal?exists> - + + <#if !grandTotal??> + - <#assign glReconciliations = delegator.findByAnd("GlReconciliation", {"glAccountId" : finAccount.postToGlAccountId?if_exists, "statusId" : "GLREC_CREATED"}, Static["org.ofbiz.base.util.UtilMisc"].toList("reconciledDate DESC"), false)> - <#if (glReconciliationId?has_content && (glReconciliationId == "_NA_" && finAccountTransList?has_content)) || !grandTotal?exists> + <#assign glReconciliations = delegator.findByAnd("GlReconciliation", {"glAccountId" : finAccount.postToGlAccountId!, "statusId" : "GLREC_CREATED"}, Static["org.ofbiz.base.util.UtilMisc"].toList("reconciledDate DESC"), false)> + <#if (glReconciliationId?has_content && (glReconciliationId == "_NA_" && finAccountTransList?has_content)) || !grandTotal??>

- <#if grandTotal?exists> + <#if grandTotal??> <#if glReconciliations?has_content> <#else> - + <#else> @@ -130,15 +130,15 @@

- <#if grandTotal?exists> + <#if grandTotal??> - <#if !grandTotal?exists> + <#if !grandTotal??> <#if (parameters.glReconciliationId?has_content && parameters.glReconciliationId != "_NA_")> - <#if ((glReconciliationId?has_content && glReconciliationId == "_NA_") && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal?exists> + <#if ((glReconciliationId?has_content && glReconciliationId == "_NA_") && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal??> @@ -169,7 +169,7 @@ <#if finAccountTrans.glReconciliationId?has_content> <#assign glReconciliation = delegator.findOne("GlReconciliation", {"glReconciliationId" : finAccountTrans.glReconciliationId}, true)> - + <#if finAccountTrans.partyId?has_content> <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : finAccountTrans.partyId}, true))!> @@ -190,30 +190,30 @@ <#list payments as payment> - <#if payment?exists && payment.paymentTypeId?has_content> + <#if payment?? && payment.paymentTypeId?has_content> <#assign paymentType = delegator.findOne("PaymentType", {"paymentTypeId" : payment.paymentTypeId}, true)> <#if payment?has_content && payment.paymentMethodTypeId?has_content> <#assign paymentMethodType = delegator.findOne("PaymentMethodType", {"paymentMethodTypeId" : payment.paymentMethodTypeId}, true)> <#if payment?has_content> - <#assign paymentGroupMembers = Static["org.ofbiz.entity.util.EntityUtil"].filterByDate(payment.getRelated("PaymentGroupMember", null, null, false)?if_exists) /> - <#assign fromParty = payment.getRelatedOne("FromParty", false)?if_exists /> + <#assign paymentGroupMembers = Static["org.ofbiz.entity.util.EntityUtil"].filterByDate(payment.getRelated("PaymentGroupMember", null, null, false)!) /> + <#assign fromParty = payment.getRelatedOne("FromParty", false)! /> <#assign fromPartyName = delegator.findOne("PartyNameView", {"partyId" : fromParty.partyId}, true) /> - <#assign toParty = payment.getRelatedOne("ToParty", false)?if_exists /> + <#assign toParty = payment.getRelatedOne("ToParty", false)! /> <#assign toPartyName = delegator.findOne("PartyNameView", {"partyId" : toParty.partyId}, true) /> <#if paymentGroupMembers?has_content> <#assign paymentGroupMember = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(paymentGroupMembers) /> class="alternate-row"> - - - - - - - + + + + + + +

${uiLabelMap.FormFieldTitle_paymentMethodTypeId}	${uiLabelMap.CommonStatus}	${uiLabelMap.CommonComments}	${uiLabelMap.AccountingCancelTransactionStatus}	${uiLabelMap.AccountingRemoveFromGlReconciliation}	${uiLabelMap.CommonSelectAll}
${uiLabelMap.FormFieldTitle_glReconciliationName}	${previousGlReconciliation.glReconciliationName?if_exists}	${previousGlReconciliation.glReconciliationName!}
${uiLabelMap.CommonStatus}	${previousStatus.description?if_exists}	${previousStatus.description!}
${uiLabelMap.FormFieldTitle_reconciledDate}	${previousGlReconciliation.reconciledDate?if_exists}	${previousGlReconciliation.reconciledDate!}
${uiLabelMap.AccountingOpeningBalance}	<@ofbizCurrency amount=previousGlReconciliation.openingBalance?default('0')/>
${uiLabelMap.FormFieldTitle_reconciledBalance}	<@ofbizCurrency amount=previousGlReconciliation.reconciledBalance?default('0')/>
${uiLabelMap.FormFieldTitle_closingBalance}	<@ofbizCurrency amount=previousClosingBalance/>	${finAccountTransType.description?if_exists}	${finAccountTransType.description!}	<#if partyName?has_content>${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}[${(partyName.partyId)!}]	${finAccountTrans.transactionDate?if_exists}	${finAccountTrans.entryDateId?if_exists}	${finAccountTrans.transactionDate!}	${finAccountTrans.entryDateId!}	<@ofbizCurrency amount=finAccountTrans.amount isoCode=defaultOrganizationPartyCurrencyUomId/>	<#if finAccountTrans.paymentId?has_content> ${finAccountTrans.paymentId}	<#if paymentType?has_content>${paymentType.description?if_exists}	<#if paymentMethodType?has_content>${paymentMethodType.description?if_exists}	<#if status?has_content>${status.description?if_exists}	${finAccountTrans.comments?if_exists}	<#if paymentType?has_content>${paymentType.description!}	<#if paymentMethodType?has_content>${paymentMethodType.description!}	<#if status?has_content>${status.description!}	${finAccountTrans.comments!}	${uiLabelMap.CommonRemove}
${acctgTransEntry.acctgTransId?if_exists}	${acctgTransEntry.acctgTransEntrySeqId?if_exists}	${acctgTransEntry.isPosted?if_exists}	${acctgTransEntry.acctgTransId!}	${acctgTransEntry.acctgTransEntrySeqId!}	${acctgTransEntry.isPosted!}	<#if acctgTransEntry.glFiscalTypeId?has_content> <#assign glFiscalType = delegator.findOne("GlFiscalType", {"glFiscalTypeId" : acctgTransEntry.glFiscalTypeId}, false)/> - ${glFiscalType.description?if_exists} + ${glFiscalType.description!}	<#if acctgTransEntry.acctgTransTypeId?has_content> <#assign acctgTransType = delegator.findOne("AcctgTransType", {"acctgTransTypeId" : acctgTransEntry.acctgTransTypeId}, false)/> - ${acctgTransType.description?if_exists} + ${acctgTransType.description!}	${acctgTransEntry.transactionDate?if_exists}	${acctgTransEntry.postedDate?if_exists}	${acctgTransEntry.glJournal?if_exists}	${acctgTransEntry.transTypeDescription?if_exists}	${acctgTransEntry.invoiceId?if_exists}	${acctgTransEntry.glAccountId?if_exists}	${acctgTransEntry.productId?if_exists}	${acctgTransEntry.debitCreditFlag?if_exists}	${acctgTransEntry.amount?if_exists}	${acctgTransEntry.origAmount?if_exists}	${acctgTransEntry.transactionDate!}	${acctgTransEntry.postedDate!}	${acctgTransEntry.glJournal!}	${acctgTransEntry.transTypeDescription!}	${acctgTransEntry.invoiceId!}	${acctgTransEntry.glAccountId!}	${acctgTransEntry.productId!}	${acctgTransEntry.debitCreditFlag!}	${acctgTransEntry.amount!}	${acctgTransEntry.origAmount!}	<#if acctgTransEntry.organizationPartyId?has_content> <#assign partyName = delegator.findOne("PartyNameView", {"partyId" : acctgTransEntry.organizationPartyId}, false)> <#if partyName.partyTypeId == "PERSON"> - ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} + ${partyName.firstName!} ${partyName.lastName!} <#elseif (partyName.partyTypeId) != "PARTY_GROUP"> - ${partyName.groupName?if_exists} + ${partyName.groupName!}	<#if (acctgTransEntry.glAccountTypeId)?has_content> <#assign glAccountType = delegator.findOne("GlAccountType", {"glAccountTypeId" : acctgTransEntry.glAccountTypeId}, false)> - ${glAccountType.description?if_exists} + ${glAccountType.description!}	${acctgTransEntry.accountCode?if_exists}	${acctgTransEntry.accountName?if_exists}	${acctgTransEntry.accountCode!}	${acctgTransEntry.accountName!}	<#if acctgTransEntry.glAccountClassId?has_content> <#assign glAccountClass = delegator.findOne("GlAccountClass", {"glAccountClassId" : acctgTransEntry.glAccountClassId}, false)/> - ${glAccountClass.description?if_exists} + ${glAccountClass.description!}	${acctgTransEntry.partyId?if_exists}	${acctgTransEntry.partyId!}	<#if acctgTransEntry.reconcileStatusId?has_content> <#assign status = delegator.findOne("StatusItem", {"statusId" : finAccountTrans.statusId}, true)> - ${status.description?if_exists} + ${status.description!}	<#if acctgTransEntry.acctgTransEntryTypeId?has_content> <#assign acctgTransEntryType = delegator.findOne("AcctgTransEntryType", {"acctgTransEntryTypeId" : acctgTransEntry.acctgTransEntryTypeId}, true)> - ${acctgTransEntryType.description?if_exists} + ${acctgTransEntryType.description!}
${uiLabelMap.PartyPartyTo}
<#if paymentGroupMember?has_content>${paymentGroupMember.paymentGroupId?if_exists}	<#if payment?has_content>${payment.paymentId?if_exists}	<#if paymentType?has_content>${paymentType.description?if_exists}	<#if paymentMethodType?has_content>${paymentMethodType.description?if_exists}	<@ofbizCurrency amount=payment.amount?if_exists/>	<#if fromPartyName?has_content>${fromPartyName.groupName?if_exists}${fromPartyName.firstName?if_exists} ${fromPartyName.lastName?if_exists}[${fromPartyName.partyId?if_exists}]	<#if toPartyName?has_content>${toPartyName.groupName?if_exists}${toPartyName.firstName?if_exists} ${toPartyName.lastName?if_exists}[${toPartyName.partyId?if_exists}]	<#if paymentGroupMember?has_content>${paymentGroupMember.paymentGroupId!}	<#if payment?has_content>${payment.paymentId!}	<#if paymentType?has_content>${paymentType.description!}	<#if paymentMethodType?has_content>${paymentMethodType.description!}	<@ofbizCurrency amount=payment.amount!/>	<#if fromPartyName?has_content>${fromPartyName.groupName!}${fromPartyName.firstName!} ${fromPartyName.lastName!}[${fromPartyName.partyId!}]	<#if toPartyName?has_content>${toPartyName.groupName!}${toPartyName.firstName!} ${toPartyName.lastName!}[${toPartyName.partyId!}]

@@ -235,22 +235,22 @@ ${finAccountTrans.finAccountTransId} - ${finAccountTransType.description?if_exists} + ${finAccountTransType.description!} <#if partyName?has_content>${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}[${(partyName.partyId)!}] - <#if glReconciliation?has_content>${glReconciliation.glReconciliationName?if_exists}[${glReconciliation.glReconciliationId?if_exists}] - ${finAccountTrans.transactionDate?if_exists} - ${finAccountTrans.entryDate?if_exists} - ${finAccountTrans.amount?if_exists} + <#if glReconciliation?has_content>${glReconciliation.glReconciliationName!}[${glReconciliation.glReconciliationId!}] + ${finAccountTrans.transactionDate!} + ${finAccountTrans.entryDate!} + ${finAccountTrans.amount!} <#if finAccountTrans.paymentId?has_content> ${finAccountTrans.paymentId} - <#if paymentType?has_content>${paymentType.description?if_exists} - <#if paymentMethodType?has_content>${paymentMethodType.description?if_exists} - <#if status?has_content>${status.description?if_exists} - ${finAccountTrans.comments?if_exists} - <#if grandTotal?exists> + <#if paymentType?has_content>${paymentType.description!} + <#if paymentMethodType?has_content>${paymentMethodType.description!} + <#if status?has_content>${status.description!} + ${finAccountTrans.comments!} + <#if grandTotal??> <#if finAccountTrans.statusId?has_content && finAccountTrans.statusId == 'FINACT_TRNS_CREATED'> ${uiLabelMap.CommonCancel} @@ -262,14 +262,14 @@ <#if glReconciliationId?has_content && glReconciliationId != "_NA_"> - <#if !(grandTotal?exists)> + <#if !(grandTotal??)> <#if (parameters.glReconciliationId?has_content && parameters.glReconciliationId != "_NA_")> <#if finAccountTrans.statusId == "FINACT_TRNS_CREATED"> ${uiLabelMap.CommonRemove} - <#if ((glReconciliationId?has_content && glReconciliationId == "_NA_") && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal?exists> + <#if ((glReconciliationId?has_content && glReconciliationId == "_NA_") && (glReconciliations?has_content && finAccountTransList?has_content)) || !grandTotal??> <#if finAccountTrans.statusId == "FINACT_TRNS_CREATED"> @@ -286,7 +286,7 @@ - <#if grandTotal?exists> + <#if grandTotal??> <#list finAccountTransList as finAccountTrans> <#if finAccountTrans.statusId?has_content && finAccountTrans.statusId == 'FINACT_TRNS_CREATED'>

- + ${uiLabelMap.AccountingShowOnlyPeriodsWithOrganization} - +

@@ -40,7 +40,7 @@ <#if currentCustomTimePeriod?has_content>

${uiLabelMap.AccountingCurrentCustomTimePeriod}
${uiLabelMap.CommonClearCurrent}
${uiLabelMap.CommonClearCurrent}

<#else>

${uiLabelMap.AccountingCurrentCustomTimePeriod}

@@ -48,8 +48,8 @@

<#if currentCustomTimePeriod?has_content>

- - + + @@ -70,7 +70,7 @@ <#list allCustomTimePeriods as allCustomTimePeriod> <#assign allPeriodType = allCustomTimePeriod.getRelatedOne("PeriodType", true)> <#assign isDefault = false> - <#if (currentCustomTimePeriod.parentPeriodId)?exists> + <#if (currentCustomTimePeriod.parentPeriodId)??> <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> <#assign isDefault = true> @@ -83,17 +83,17 @@ - <#if (currentCustomTimePeriod.parentPeriodId)?exists> - + <#if (currentCustomTimePeriod.parentPeriodId)??> + ${uiLabelMap.CommonSetAsCurrent} - + - - + + - - - + + + - + - - + + @@ -240,8 +240,8 @@

- - + +

${uiLabelMap.CommonParent} @@ -250,14 +250,14 @@ <#list allCustomTimePeriods as allCustomTimePeriod> <#assign allPeriodType = allCustomTimePeriod.getRelatedOne("PeriodType", true)> <#assign isDefault = false> - <#if currentCustomTimePeriod?exists> + <#if currentCustomTimePeriod??> <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId> <#assign isDefault = true>

- <#if surveyQuestionAndAppl?exists && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> + <#if surveyQuestionAndAppl?? && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> <#-- seperator options --> <#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT"> - + <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE"/> <#else/> Index: applications/content/template/email/servicenotification.ftl =================================================================== --- applications/content/template/email/servicenotification.ftl (revision 1590602) +++ applications/content/template/email/servicenotification.ftl (working copy) @@ -22,11 +22,11 @@ The Context : <#list serviceContext.keySet() as ckey> - ${ckey?if_exists} --> ${(serviceContext.get(ckey))?if_exists} + ${ckey!} --> ${(serviceContext.get(ckey))!} The Result : <#list serviceResult.keySet() as rkey> - ${rkey?if_exists} --> ${(serviceResult.get(rkey))?if_exists} + ${rkey!} --> ${(serviceResult.get(rkey))!} \ No newline at end of file Index: applications/content/webapp/content/lookup/ContentTreeLookupList.ftl =================================================================== --- applications/content/webapp/content/lookup/ContentTreeLookupList.ftl (revision 1590602) +++ applications/content/webapp/content/lookup/ContentTreeLookupList.ftl (working copy) @@ -69,29 +69,29 @@ <#if tabButtonItem=="ListContentTree"> <#--Form ListContentTree--> class="alternate-row"> - - - + + + <#elseif tabButtonItem=="ListDocument"> <#--Form ListDocument--> class="alternate-row"> - - - - - + + + + + <#if contentData.caFromDate?has_content> <#assign caFromDate = Static["org.ofbiz.base.util.UtilDateTime"].toDateString(contentData.caFromDate, "dd/MM/yyyy")/> - + - - - - + + + + <#assign alt_row = !alt_row/> Index: applications/content/webapp/content/content/ContentSearchResults.ftl =================================================================== --- applications/content/webapp/content/content/ContentSearchResults.ftl (revision 1590602) +++ applications/content/webapp/content/content/ContentSearchResults.ftl (working copy) @@ -58,7 +58,7 @@ <#assign content = delegator.findOne("Content", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", contentId), false)> Index: applications/content/webapp/content/content/nav.ftl =================================================================== --- applications/content/webapp/content/content/nav.ftl (revision 1590602) +++ applications/content/webapp/content/content/nav.ftl (working copy) @@ -37,7 +37,7 @@ <#list assocList as assoc> { "data": {"title" : unescapeHtmlText("${assoc.categoryName!assoc.dataCategoryId!}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.dataCategoryId!}');"}} - <#assign assocs = assoc.getRelated("ChildDataCategory", null, null, false)?if_exists/> + <#assign assocs = assoc.getRelated("ChildDataCategory", null, null, false)!/> <#if assocChilds?has_content> ,"children": [ <@fillTree assocList = assocChilds/> Index: applications/content/webapp/content/content/DisplayContentNav.ftl =================================================================== --- applications/content/webapp/content/content/DisplayContentNav.ftl (revision 1590602) +++ applications/content/webapp/content/content/DisplayContentNav.ftl (working copy) @@ -78,7 +78,7 @@ <#-------------------------------------------------------------------------------------callDocument function--> function callDocument(contentId) { - var tabitem='${tabButtonItem?if_exists}'; + var tabitem='${tabButtonItem!}'; if (tabitem=="navigateContent") listDocument = '<@ofbizUrl>/views/ListDocument'; if (tabitem=="LookupContentTree") Index: applications/content/webapp/content/content/ContentSearchOptions.ftl =================================================================== --- applications/content/webapp/content/content/ContentSearchOptions.ftl (revision 1590602) +++ applications/content/webapp/content/content/ContentSearchOptions.ftl (working copy) @@ -28,7 +28,7 @@ @@ -62,7 +62,7 @@ @@ -85,13 +85,13 @@

${uiLabelMap.CommonId}

<#assign hasntStarted = false> <#assign compareDate = currentCustomTimePeriod.getDate("fromDate")> @@ -160,9 +160,9 @@ <#assign periodType = customTimePeriod.getRelatedOne("PeriodType", true)>

${customTimePeriod.customTimePeriodId}

<#assign hasntStarted = false> <#assign compareDate = customTimePeriod.getDate("fromDate")> <#if compareDate?has_content> <#if nowTimestamp.before(compareDate)><#assign hasntStarted = true> - class="alert" /> + class="alert" />

<#assign hasExpired = false> @@ -214,13 +214,13 @@ <#if compareDate?has_content> <#if nowTimestamp.after(compareDate)><#assign hasExpired = true> - class="alert" /> + class="alert" />

- + ${uiLabelMap.CommonDelete} - + ${uiLabelMap.CommonSetAsCurrent}

<@renderSurveyQuestionText surveyQuestionAndAppl=surveyQuestionAndAppl/> @@ -251,7 +251,7 @@ <#else/> <#-- special formatting for select boxes --> <#assign align = "left"/> - <#if surveyQuestionAndAppl?exists && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> + <#if surveyQuestionAndAppl?? && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> <#if (surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN" || surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT" || surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION")> <#assign align = "right"/> @@ -259,19 +259,19 @@ <#-- get an answer from the answerMap --> <#if surveyAnswers?has_content> - <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists/> + <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)!/> <#-- get the default value from value map --> <#if defaultValues?has_content> - <#assign defValue = defaultValues.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists/> + <#assign defValue = defaultValues.get(surveyQuestionAndAppl.surveyQuestionId)!/>

${surveyQuestionAndAppl.question?if_exists}

${surveyQuestionAndAppl.question!}

${contentData.contentId?if_exists}

${contentData.contentName?if_exists}

${contentData.mimeTypeId?if_exists}

${contentData.contentId!}

${contentData.contentName!}

${contentData.mimeTypeId!}

${contentData.contentName?if_exists}[${contentData.contentId?if_exists}]

${uiLabelMap.CommonView}

${contentData.contentTypeId?if_exists}

${contentData.mimeTypeId?if_exists}

${contentData.statusId?if_exists}

${contentData.contentName!}[${contentData.contentId!}]

${uiLabelMap.CommonView}

${contentData.contentTypeId!}

${contentData.mimeTypeId!}

${contentData.statusId!}

${caFromDate?if_exists}

${caFromDate!}

${uiLabelMap.CommonDelete}

- ${contentId} ${(content.contentName)?if_exists} + ${contentId} ${(content.contentName)!}

${uiLabelMap.ContentKeywords}

- + ${uiLabelMap.CommonAny}checked="checked"/> ${uiLabelMap.CommonAll}checked="checked"/>

@@ -38,7 +38,7 @@

${uiLabelMap.FormFieldTitle_contentId}

- <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CONTENT_ID?if_exists}" formName="advToKeyWordSearchForm" name="SEARCH_CONTENT_ID" id="SEARCH_CONTENT_ID" fieldFormName="LookupContent"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CONTENT_ID!}" formName="advToKeyWordSearchForm" name="SEARCH_CONTENT_ID" id="SEARCH_CONTENT_ID" fieldFormName="LookupContent"/>

${uiLabelMap.PartyPartyId}

- <@htmlTemplate.lookupField value="${requestParameters.partyId?if_exists}" formName="advToKeyWordSearchForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> + <@htmlTemplate.lookupField value="${requestParameters.partyId!}" formName="advToKeyWordSearchForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/>

Index: applications/content/webapp/content/content/ContentNav.ftl =================================================================== --- applications/content/webapp/content/content/ContentNav.ftl (revision 1590602) +++ applications/content/webapp/content/content/ContentNav.ftl (working copy) @@ -108,7 +108,7 @@ <#-------------------------------------------------------------------------------------callDocument function--> function callDocument(contentId) { - var tabitem='${tabButtonItem?if_exists}'; + var tabitem='${tabButtonItem!}'; if (tabitem=="navigateContent") listDocument = '<@ofbizUrl>/views/ListDocument'; if (tabitem=="LookupContentTree") Index: applications/content/webapp/content/contentsetup/UserPermissions.ftl =================================================================== --- applications/content/webapp/content/contentsetup/UserPermissions.ftl (revision 1590602) +++ applications/content/webapp/content/contentsetup/UserPermissions.ftl (working copy) @@ -32,19 +32,19 @@ rowCountElement = document.createElement("input"); rowCountElement.setAttribute("name", "partyId"); rowCountElement.setAttribute("type", "hidden"); - rowCountElement.setAttribute("value", "${partyId?if_exists}"); + rowCountElement.setAttribute("value", "${partyId!}"); document.forms.siteRoleForm.appendChild(rowCountElement); rowCountElement = document.createElement("input"); rowCountElement.setAttribute("name", "userLoginId"); rowCountElement.setAttribute("type", "hidden"); - rowCountElement.setAttribute("value", "${userLoginId?if_exists}"); + rowCountElement.setAttribute("value", "${userLoginId!}"); document.forms.siteRoleForm.appendChild(rowCountElement); rowCountElement = document.createElement("input"); rowCountElement.setAttribute("name", "webSitePublishPoint"); rowCountElement.setAttribute("type", "hidden"); - rowCountElement.setAttribute("value", "${webSitePublishPoint?if_exists}"); + rowCountElement.setAttribute("value", "${webSitePublishPoint!}"); document.forms.siteRoleForm.appendChild(rowCountElement); document.forms.siteRoleForm.submit(); @@ -65,10 +65,10 @@ @@ -90,7 +90,7 @@ <#assign rowCount=0/> <#list siteList as map> - + <#list blogRoleIdList as roleTypeId> <#assign cappedSiteRole= Static["org.ofbiz.entity.model.ModelUtil"].dbNameToVarName(roleTypeId) />

- <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.fromDate?if_exists}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.fromDate!}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> ${uiLabelMap.CommonFrom}
- <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.thruDate?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.thruDate!}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> ${uiLabelMap.CommonThru}
- + - - + +
${map.partyId?if_exists}	${map.partyId!}	@@ -104,7 +104,7 @@
- ${uiLabelMap.CommonUpdate} + ${uiLabelMap.CommonUpdate}

Index: applications/content/webapp/content/layout/renderSubContent.ftl =================================================================== --- applications/content/webapp/content/layout/renderSubContent.ftl (revision 1590602) +++ applications/content/webapp/content/layout/renderSubContent.ftl (working copy) @@ -18,9 +18,9 @@ -->

-<#if parameters.contentId?exists> +<#if parameters.contentId??> <#assign id=parameters.contentId/> - <@editRenderSubContent contentId="TEMPLATE_MASTER" mapKey="" editTemplate="true" subContentId=id?if_exists> + <@editRenderSubContent contentId="TEMPLATE_MASTER" mapKey="" editTemplate="true" subContentId=id!> <@renderSubContent throwExceptionOnError="false"/> Index: applications/content/webapp/content/survey/EditSurveyResponse.ftl =================================================================== --- applications/content/webapp/content/survey/EditSurveyResponse.ftl (revision 1590602) +++ applications/content/webapp/content/survey/EditSurveyResponse.ftl (working copy) @@ -22,8 +22,8 @@

${uiLabelMap.PartyPartyId}: <@htmlTemplate.lookupField value="${userLogin.partyId}" formName="EditSurveyResponseForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> <#-- pass through the dataResourceId so the response can be associated with it --> - - + + ${StringUtil.wrapString(surveyString)} <#else> Index: applications/content/webapp/content/survey/ViewSurveyResponses.ftl =================================================================== --- applications/content/webapp/content/survey/ViewSurveyResponses.ftl (revision 1590602) +++ applications/content/webapp/content/survey/ViewSurveyResponses.ftl (working copy) @@ -23,12 +23,12 @@ <#if questions?has_content> <#list questions as question> - <#assign results = surveyResults.get(question.surveyQuestionId)?if_exists> + <#assign results = surveyResults.get(question.surveyQuestionId)!> <#-- seperator options --> <#if question.surveyQuestionTypeId == "SEPERATOR_TEXT"> - ${question.question?if_exists} + ${question.question!} <#elseif question.surveyQuestionTypeId == "SEPERATOR_LINE">

<#else> @@ -39,7 +39,7 @@ <#if (results._total?default(0) == 1)> <#assign answerString = "${uiLabelMap.ContentAnswer}"> -

${question.question?if_exists} (${results._total?default(0)?string.number} ${answerString})

${question.question!} (${results._total?default(0)?string.number} ${answerString})

<#if question.hint?has_content>

${question.hint}

@@ -57,13 +57,13 @@ ${uiLabelMap.CommonN} [${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]

<#elseif question.surveyQuestionTypeId == "OPTION"> - <#assign options = question.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists> + <#assign options = question.getRelated("SurveyQuestionOption", null, sequenceSort, false)!> <#if options?has_content> <#list options as option> - <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists> + <#assign optionResults = results.get(option.surveyOptionSeqId)!>

- ${option.description?if_exists} + ${option.description!} [${optionResults._total?default(0)?string("#")} / ${optionResults._percent?default(0?string("#"))}%]

@@ -74,21 +74,21 @@ <#if answers?has_content> <#list answers as answer> <#if question.surveyQuestionTypeId == "TEXTAREA"> -